Fix blkif 'grant-table-ification'

Signed-off-by: Steven Hand <steve@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
index 4aaef6b11600708714e8bbe1ae73fefd3a9b9e16..aaa976c5579966392551cdad34b5bb85225710f7 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
@@ -219,9 +219,7 @@ void blkif_connect(blkif_be_connect_t *connect)
         op.ref            = ref;
         op.dom            = domid;
        
-        if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))) {
-            BUG();
-        }
+        BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
        
         handle = op.handle;
        
@@ -232,10 +230,6 @@ void blkif_connect(blkif_be_connect_t *connect)
             return;
         }
 
-        phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
-                                PAGE_SHIFT] =
-                      FOREIGN_FRAME(shmem_frame);
-
         blkif->shmem_ref = ref;
         blkif->shmem_handle = handle;
         blkif->shmem_vaddr = VMALLOC_VMADDR(vma->addr);